tables oh yes
Merge branch 'master' of github.com:rdrapeau/Bad-Class

Conflicts:
	www/index.html