Merge pull request #5 from saltys/testing

Add testing gems
Merge pull request #6 from saltys/testing

Add readme
Add welcome page
Merge pull request #7 from saltys/welcome

Add welcome page
Add font-awesome
Getting stylish
Merge branch 'master' of https://github.com/saltys/my_site into welcome
Menu
Merge pull request #8 from saltys/welcome

Welcome
Menu boxes
Merge branch 'master' of https://github.com/saltys/my_site into welcome
Menu margin
Merge pull request #9 from saltys/welcome

Welcome
Features folder