Merge branch 'hotfix/1.0.2' into develop

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.0.2
+-----
+* Updated gems
+* Updated README
+
 1.0.1
 -----
 * Updated gems

Gemfile.lock

@@ -147,7 +147,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.1)
       pry (>= 0.9.10)
-    puma (2.1.1)
+    puma (2.2.0)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-contrib (1.1.0)
@@ -239,7 +239,7 @@ GEM
       rack
       raindrops (~> 0.7)
     uniform_notifier (1.2.0)
-    webmock (1.12.2)
+    webmock (1.12.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     websocket (1.0.7)

README.md

@@ -3,12 +3,22 @@ Starter App [![Build Status](https://travis-ci.org/diowa/ruby2-rails4-bootstrap-
 
 This is a starter web application based on the following technology stack:
 
-* Ruby 2
-* Rails 4.0.0
-* PostgreSQL
-* RSpec
-* Twitter Bootstrap
+* [Ruby 2][1]
+* [Rails 4.0.0][2]
+* [PostgreSQL][3]
+* [RSpec][4]
+* [Twitter Bootstrap 2.3.2][5]
+* [Font Awesome 3.2.1][6]
+* [HAML][7]
 
-Starter App is deployable on Heroku. Demo: http://ruby2-rails4-bootstrap-heroku.herokuapp.com/
+[1]: http://www.ruby-lang.org/en/
+[2]: http://rubyonrails.org/
+[3]: http://www.postgresql.org/
+[4]: http://rspec.info/
+[5]: http://twitter.github.com/bootstrap/
+[6]: http://fontawesome.io/
+[7]: http://haml.info/
+
+Starter App is deployable on (Heroku)[http://www.heroku.com/]. Demo: http://ruby2-rails4-bootstrap-heroku.herokuapp.com/
 
 ```Gemfile``` also contains a set of useful gems for performance, security, api building...

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2