basic temp saving
Merge branch 'master' of https://github.com/millew2/Reggie

Conflicts:
	code/main.cpp