clear
Delete index.html
Delete README.md
Merge branch 'master' of https://github.com/csteenbock/ipm_project

Conflicts:
	README.md