new modals
Merge branch 'master' of https://github.com/myayo/EADJAVA/
login page + css
resolve conflict
Merge remote-tracking branch 'origin/master'