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
Made testcase for Comment class. Not complete yet.
Tried for a push
Fixed Comment class testcase
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
Added camera permissions to the manifest
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Changed MainActivity XML layout
Edited testcase for Comment class
Reorganized UML and removed classes not present in code.
Added Network classes to UML
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Added Network classes to UML
Added test for editText
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/classes/cs/ualberta/ca/tunein/Comment.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$1.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$2$1.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$2.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$3.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$4.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter.class
	bin/classes/cs/ualberta/ca/tunein/ThreadController.class
	bin/classes/cs/ualberta/ca/tunein/ThreadControllerInterface.class
	bin/classes/cs/ualberta/ca/tunein/TopicListActivity$1.class
	bin/classes/cs/ualberta/ca/tunein/TopicListActivity.class
Implemented Main menu button to go back to title screen.