get ready for step 3
Merge branch 'master' of https://bitbucket.org/schnorr/compil-2014-1

Conflicts:
	src/gv.c
	src/main.c