snapshot added
reverted
asdasdf
I dont know what to do
asdf
I dunno
Merge remote-tracking branch 'origin/master'

Conflicts:
	hw0-manair/pom.xml.releaseBackup
	hw0-manair/release.properties