tired
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/eamondo2/main/Main.java
fuckit night