Removed unnecessary file
Added front end notes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Testing, Maico.txt