Add built files for the rgbColor and keywordColor commits

dist/css/bootstrapValidator.min.css

@@ -12,6 +12,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
  * @version     v0.5.3-dev, built on 2014-10-06 8:02:42 AM
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 9:55:01 PM
@@ -43,6 +44,9 @@
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 9:57:46 PM
 >>>>>>> Add validator and test suite for color validation
+=======
+ * @version     v0.5.2-dev, built on 2014-09-18 10:00:59 PM
+>>>>>>> Add built files for the rgbColor and keywordColor commits
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT

dist/js/bootstrapValidator.js

@@ -12,6 +12,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
  * @version     v0.5.3-dev, built on 2014-10-06 8:02:42 AM
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 9:55:01 PM
@@ -43,6 +44,9 @@
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 9:57:46 PM
 >>>>>>> Add validator and test suite for color validation
+=======
+ * @version     v0.5.2-dev, built on 2014-09-18 10:00:59 PM
+>>>>>>> Add built files for the rgbColor and keywordColor commits
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT

dist/js/bootstrapValidator.min.js

@@ -12,6 +12,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
  * @version     v0.5.3-dev, built on 2014-10-06 8:02:42 AM
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 9:55:01 PM
@@ -43,6 +44,9 @@
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 9:57:46 PM
 >>>>>>> Add validator and test suite for color validation
+=======
+ * @version     v0.5.2-dev, built on 2014-09-18 10:00:59 PM
+>>>>>>> Add built files for the rgbColor and keywordColor commits
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT