added comments
merged conflicts
Merge branch 'master' of github.com:eecs183/gameOfLife into lisa

Conflicts:
	gol.js
Merge branch 'master' of github.com:eecs183/gameOfLife into lisa
Merge branch 'master' of github.com:eecs183/gameOfLife into lisa
Added RMEs
Fixed RMEs
Merge lisa to master