Minor change to forget
Merge branch 'master' of github.com:xbelanch/LD29-Beneath-The-Surface

Conflicts:
	assets/images/views/.DS_Store
Merge branch 'master' of github.com:xbelanch/LD29-Beneath-The-Surface
Merge branch 'master' of github.com:xbelanch/LD29-Beneath-The-Surface
minor changes