updating projects
resolving dropbox conflicts

Conflicts:
	work.html