displayed minutes in time
Merge branch 'master' into steven
Working on reply to the correct comment
Merge branch 'master' into steven
working on sorting by date
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/SubCommentViewActivity.java
Merge with master
working on sorting
Merge branch 'master' into steven
Added javaDoc for EditCommentActivity
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Finished work on sorting head comment's subComments by pictures
Merge branch 'master' into steven
Adding comments to SCVA
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole