Added a new file
Modify story1 file
Merge remote-tracking branch 'upstream/master'
New files
Merge git://github.com/jholleran/tcube-jan2014
Merge branch 'jh-feature' of https://github.com/jholleran/tcube-jan2014 into jholleran-jh-feature

Conflicts:
	sample1.txt
	story1.txt
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014