Merge pull request #1 from natalie03/master

added dependencies
setting up environment
haml layout
moved bower files