Added TestFile.txt
test test
Added MVC planning sketch from Group Meeting on Tuesday, Feb 11
Retrying commit
Merge https://github.com/bwylie1/Group-Project
updating my fork with the current pull from the master branch.
retrying fork update
deleted useless folder
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	gen/cs/ualberta/ca/tunein/R.java
	project.properties
	res/layout/activity_main.xml
	res/layout/comment_view_row.xml
	res/layout/create_comment_view.xml
	src/cs/ualberta/ca/tunein/MainActivity.java
	src/cs/ualberta/ca/tunein/TopicListActivity.java
updating new fork
fixed merge conflicts