attempting to change directory setup to ignore multiple sub-app
Merge branch 'master' of https://github.com/DJchopstix13/In2Indie

Conflicts:
	server/app.js
	web-client/app.js