merged master
merged master
refactored js for easy-reading and prototypal inheritance
removed temp file