update to 0.0.4
Merge branch 'master' of https://github.com/Iluvatar/UWROV-2014
(0.0.4/0.1.0)
Conflicts:
	test_file.txt