Merge branch 'master' of https://github.com/mickelson/attract

Conflicts:
	src/fe_util.cpp
Merge branch 'master' of https://github.com/mickelson/attract

Conflicts:
	src/fe_util.cpp