Added live client ID / client secret / redirect uri as constants to app.js
Merge branch 'master' of github.com:lthrock/cs147_project

Conflicts:
	app.js