Merge branch 'develop'
add todos to the readme
Merge branch 'master' into develop
add jasmine and restructure project directory
change main project filename
add css for highlighting
change name of main file
add highlight css
spec stuff etc