test
Merge branch 'master' of https://github.com/delcore92/HackAgong

Conflicts:
	Hackagong/App_Start/Startup.Auth.cs