Merge branch 'master' of https://github.com/grayayer/sacred2013

Conflicts:
	git_test.html
changes
for real