First commit
Emil testar
I Rulez More
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Main.java
This time It'll work
Merge pull request #3 from Magragosh/master

Classes (Fredrik Svensson)