Login, Register

Login, Register
Merge branch 'master' of https://github.com/DemjanGrubic/Hakaton

Conflicts:
	Hackathon/Hackathon/Web.config
	Hackathon/Hackathon/bin/Hackathon.dll.config