Indented
Deleting stuff
Merge branch 'master' of github.com:kheaactua/mayofest into stage
Merge branch 'master' of github.com:kheaactua/mayofest into stage

Conflicts:
	htdocs/sites/mayofest14_dev/package.json
Somehow the migration was fucked up..