Late Night fuuuu...
blah blah
Merge branch 'master' of https://github.com/gingerbeard92/GetRekked

Conflicts:
	GetRekked/war/WEB-INF/classes/.gitignore
what is going on with all this whiz