commits

commits
Merge branch 'master' into John

Conflicts:
	js/main.js
resolved conflicts

resolved conflicts
some rev/for button actions that sorta work

using fButton and rButton objects
Merge branch 'John'