Updated func.js, rewrote as func2.js which is nearly complete
Commit to protect in merge
Attempt to merge: Merge branch 'master' of github.com:kmyr/perseus

Conflicts:
	func.js