gd
Merge branch 'master' of https://github.com/karkn128/TDP003

Conflicts:
	TDP003_flask/TDP003_flask.py
	TDP003_flask/templates/layout.html