coronet
Merge branch 'master' of https://github.com/andrewsarnold/FlagMaker

Conflicts:
	FlagMaker/readme.htm