Merge pull request #1 from nahumj/master

Fixed Horrible Error
made test.py executable
made some actual code
First draft - buggy
Functional first draft