Updating git
updating git
123
Started to do some test cases
Started Test Cases
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	TuneInTest/.classpath
	TuneInTest/src/cs/ualberta/ca/tuneintest/commentControllerTest.java
	TuneInTest/src/cs/ualberta/ca/tuneintest/commentTest.java
	TuneInTest/src/cs/ualberta/ca/tuneintest/topicListActivityTest.java
	gen/cs/ualberta/ca/tunein/R.java