no message
no message
Merge branch 'master' of https://github.com/SteamRiC/TeamNumberTwo

Conflicts:
	POS/application.properties
	POS/src/ee/ut/math/tvt/teamnumbertwo/Intro.java