backbone folders and asset structure
Merge branch 'master' into marcus
test for merging conflict
Merge pull request #13 from MollyMoile/marcus

backbone folders and asset structure