new template setup
almost there
moving to yeoman workflow
dropping the beat
deleted all stock files
yeoman workflow
getting ready to rock
some assembly needed
ready to merge
lets merge em
merg ready
merging
Merge branch 'new-design'

Conflicts:
	.DS_Store