merge
merge
merge
merge
Merge branch 'master' of github.com:ITintheD/ItInTheD
fixed user login