Ändrat i pub.java
Merge branch 'master' of https://github.com/johannessjoberg/Pubapp

Conflicts:
	bin/classes/com/example/pubapp/Pub.class
	bin/classes/com/example/pubapp/Pubar.class