limited image size
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/R.txt
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12/gen/com/google/android/gms/R.java
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
	google-play-services_lib/gen/com/google/android/gms/R.java
	google-play-services_lib/project.properties
Merge pull request #92 from ibarreto/master

limit image size