Mod .gitignore
Merge branch 'master' of https://github.com/miamidade/OEM-Application

Conflicts:
	.gitignore
	app/devDb.h2.db
added registration page for users
rm db
merge
add to gitignore