1
Merge branch 'master' of github.com:ethiffeault/Minion

Conflicts:
	main.cpp
Merge branch 'master' of github.com:ethiffeault/Minion