GAHHHHH
Merge branch 'master' of http://github.com/kuykendall-benjamin/School-Project-KNKG

Conflicts:
	src/application_states/DevOptions.java
	src/base/Runner.java
Merge branch 'master' of http://github.com/kuykendall-benjamin/School-Project-KNKG

Conflicts:
	src/base/DevOps.java