Gemfile needed
Merge branch 'master' into development
Add HTML5 Boiler Plate http://html5boilerplate.com/
Merge branch 'development'