Merging so I can checkout
Merge branch 'master' of https://github.com/6813PhysFit/physfit

Conflicts:
	KVfiles/kv.html
saving js changes
merged results and added todos