misc changes. Still working on arrow
Merge remote branch 'origin/master'

Conflicts:
	static/projectView.html