saving branch
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/resources.ap_
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/resources.ap_
.gitignore test
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	gen/cs/ualberta/ca/tunein/R.java
Fixed some test syntax