temp commit

temp commit
still trying to fix conflict.
Merge branch 'master' of https://github.com/kdilts/A101

Conflicts:
	modified_euler/euler.html