commit
commit
Merge branch 'master' of http://github.com/joybee007/acs

Conflicts:
	views/index.ejs
	views/login.ejs