2014-03-11 test2
Merge branch 'master' of github.com:kevinxyz/test into test2

Conflicts:
	dated_file.txt
Remove >>> line