First commit to git
Merge branch 'master' of https://github.com/daviesray-ornyx/ornyxoft

Conflicts:
	app.js
Changes for connection string