djtest
Merge branch 'master' of https://github.com/blazexdj/rkemdhs.git

Conflicts:
	GuardOn/src/test/gitTest.java
Merge branch 'master' of https://github.com/blazexdj/rkemdhs.git
djk