deleted state
Merge branch 'master' of github.com:alpm/FinalYearProject

Conflicts:
	index.html