Marco fixing fucntion

Marco fixing function
merge
Merge branch 'master' of https://github.com/inachen/iPQB-Bootcamp-GO

Conflicts:
	bootcamp/easier_stuff.py
	bootcamp/easier_stuff.pyc
	bootcamp/harder_stuff.pyc
	bootcamp/views.pyc