added register functions
'merged'
Merge branch 'master' of https://github.com/mHacks-UWProject/SurroundSound
Merged
Conflicts:
	models/DatabaseFunctions.js