fuck ths shit
 Dev Clean up
 more clean up dev
 gasdf
sdf
Fixed merges and updated the gulpfile
changes for merging'
merge conflicts
items coming in for menu and latest story