removed tikz from tables
added options to documentclass
Merge remote-tracking branch 'origin/master'

Conflicts:
	Math120Master.tex