Made a minor edit to the UML chart
Merge pull request #1 from CMPUT301W14T3/master

Pull for most recent commit
Made changes to UML chart; User needs an association
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/AndroidManifest.xml
	gen/cs/ualberta/ca/tunein/R.java
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project