hold
Fixed stuff
fixed
added my ignore file
Merge branch 'master' into JA-dev
Stuff
Classes
merge fixes
Merge branch 'master' of https://github.com/thEtan/Mini-Project
using theirs
Merge branch 'master' of https://github.com/thEtan/Mini-Project
Updated loginpageservlet
Merge branch 'master' into ET-dev