merged master
merged master
refactored js for easy-reading and prototypal inheritance
Merge branch 'master' into gh-pages
removed temp file
Merge branch 'master' into gh-pages
updated to new version