edit login function
Merge branch 'master' of https://github.com/jcslaa/hackathon
Merge branch 'master' of https://github.com/jcslaa/hackathon
Merge branch 'master' of https://github.com/jcslaa/hackathon
Merge branch 'master' of https://github.com/jcslaa/hackathon
Merge branch 'master' of https://github.com/jcslaa/hackathon
Merge branch 'master' of https://github.com/jcslaa/hackathon
Merge branch 'master' of https://github.com/jcslaa/hackathon
Merge branch 'master' of https://github.com/jcslaa/hackathon
Merge branch 'master' of https://github.com/jcslaa/hackathon
model changed
create function newWish
Merge branch 'master' of https://github.com/jcslaa/hackathon

Conflicts:
	WishApp/donghyun.py
asdf