Initial commit
Initial framework
Updating README.txt (mainly as a push test for building)
Started updating some APM sources for reference
Merge remote-tracking branch 'origin/master'

"Conflicts" that weren't any sort of conflict at all, just git somehow thinking our changes conflicted when they really didn't, for example I had not even TOUCHED license.txt and the "conflicting" section of Info.java (between === and ORIGIN>>>) was completely blank:
	LICENSE.txt
	src/main/java/com/kaijin/AdvResMan/Info.java