Add 2 gems: foundation-rails, font-awesome
Remove foundation
Weird stuff happening
Add .gitignore to master
Fix merge conflicts