Retrieve in the works

Decides to work or not work
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project

Conflicts:
	bin/classes/com/example/team04project/MainActivity.class