my version
Merge branch 'master' of https://github.com/skulane/DuckTOSkyfallDODuck

Conflicts:
	TODOApplication.html