login test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/comp61542/static/app.db
Merge branch 'master' of https://github.com/JeffriesAgile/comp61542-2014-lab

Conflicts:
	src/comp61542/static/app.db
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/comp61542/static/app.db