Update README.md
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #6 from yggie/develop

Internationalization
Merge remote-tracking branch 'thomas/develop' into develop
'Create a website' feature complete.
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #7 from coloradobum/develop

Finished "Create a website" Feature, travis doesn't seem to be working
Changed Ruby version in travis.yml to just 2.0.0
Testing Bundler Caching on Travis
Unfortunately, Bundler Caching works only on Private Travis Repos :(
Upgraded to ruby 2.1.0
Changed Travis Ruby version to Ruby 2.1.0
Merge pull request #8 from sampritipanda/develop

Thanks Sampriti, looks good
updated README.md
Merge pull request #9 from evo2013/develop

Thanks for the info Viv
added bootstrap sass and a navbar partial
added codealia class to index page. Updated css with fonts and bg-images