delete
Merge branch 'master' of github.com:loethen/ergoulife

Conflicts:
	application/views/include/footer.php
	js/main.js