..
styling
Commit
Merge branch 'master' of https://github.com/ZackiMcWoo/WhereAmI.git
Merge remote-tracking branch 'origin/master' into WhereAmI-AdB

Conflicts:
	webcontent/WEBINF/classes/MysqlDatabaseServlet.class
	webcontent/ajax.js
	webcontent/css/style.css
	webcontent/index.html
	webcontent/script.js