first commit from server
second commit from server

Merge branch 'master' of https://github.com/jhollist/cscie12

Conflicts:
	Assignment3/cscie12_assignment3/answers.html
	Assignment3/cscie12_assignment3/tablesorter.html