merge
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers

Conflicts:
	Agora/gen/com/brogrammers/agora/R.java