Merge remote-tracking branch 'origin/Tom'
Merge remote-tracking branch 'origin/Tom'
Fixed ad bug
Fixed ad bug again
Merge remote-tracking branch 'origin/Tom'
Fuck this GIT SHIT
Commit it
Fuck it
Fuck it
Fixed alot of stuff
Patched up initial messages
Again
Merge remote-tracking branch 'origin/master' into SagieBranch

Conflicts:
	IceCaveProject/res/values/strings.xml
	IceCaveProject/src/com/tas/icecave/gui/LoadingScreen.java
Merge remote-tracking branch 'origin/master' into SagieBranch

Conflicts:
	IceCaveProject/src/com/tas/icecave/gui/LoadingScreen.java
Added usage of the library