init commit
Merge branch 'master' of https://github.com/DJChopstix13/in2indie

Conflicts:
	app.js
	package.json
	web-client/views/index.jade
	web-client/views/layout.jade