The second one
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollegeCrawl-desktop/src/com/fhd/CollegeCrawl/Main.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollegeCrawl-desktop/src/com/fhd/CollegeCrawl/Main.java
test
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	CollegeCrawl-desktop/bin/com/fhd/CollegeCrawl/Main.class
	CollegeCrawl/bin/com/fhd/CollegeCrawl/CollegeCrawlGame.class
	CollegeCrawl/src/com/fhd/CollegeCrawl/CollegeCrawlGame.java
wwwaah
Merge branch 'master' of https://github.com/yksikaksikolme/CollegeCrawl

Conflicts:
	CollegeCrawl-desktop/bin/com/fhd/CollegeCrawl/PCLauncher.class
	CollegeCrawl/bin/com/fhd/CollegeCrawl/CollegeCrawlGame.class
test
New BugHunt Minigame
Merge branch 'master' of https://github.com/yksikaksikolme/CollegeCrawl

Conflicts:
	CollegeCrawl-desktop/bin/com/fhd/CollegeCrawl/PCLauncher.class
	CollegeCrawl/bin/com/fhd/CollegeCrawl/CollegeCrawlGame.class
	CollegeCrawl/bin/com/fhd/CollegeCrawl/Timer.class
	CollegeCrawl/data/content/map2.png