lalala
merged some code
Merge branch 'master' of https://github.com/fabiopk/android_project.git
Merge branch 'master' of https://github.com/fabiopk/android_project.git

Conflicts:
	Link - Ghost Hunter/src/com/kilobolt/robotgame/MainMenuScreen.java
Added Portal
POrtaaaal!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Link - Ghost Hunter/src/com/kilobolt/robotgame/LoadingScreen.java
Merge branch 'master' of https://github.com/fabiopk/android_project.git
lalalalallalalalalal
Sdasda
Added new GUI, with more items and stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Link - Ghost Hunter/src/com/kilobolt/robotgame/GameScreen.java