Kinda sorta uploads from ES. Nees work still.
Merge branch 'master' of https://github.com/g-chag/CMPUT301F14T01-Team1Project

Conflicts:
	Yodelit/bin/MainActivity.apk
	Yodelit/bin/classes.dex
	Yodelit/bin/resources.ap_