??
Merge branch 'master' of heroku.com:berc-test

Conflicts:
	berc.py
test models
cancle test
add password encryption
add password encryption
add password encryption
add password encryption
add password encryption
modify sign-up logic
check duplicate login name