Crap text
Merge branch 'master' of https://github.com/MahApp/OnGit.git

Conflicts:
	SwingProj/src/LarsClass.java