Merge pull request #2 from natalie03/master

moved bower files
allthethings
stuff
Merge pull request #3 from slwaller/master

allthethings
set up assets