committing everything2
Merge branch 'develop'
updating
Merge branch 'master' into develop
login/signups plus refactoring