added some logic to login page
Merge branch 'master' of https://github.com/esoergel/peacecorps into develop