Ready to go!
Initial commit, I did stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/tenjava/entries/KrazyTraynz/t3/TenJava.java
Initial commit, I did stuff