Login test added, need to be fixed
Merge branch 'master' of github.com:kcjpop/emotionless

Conflicts:
	application/models/user_model.php
	assets/js/register.js