Merge pull request #22 from delasky/master

pulling down
Merge pull request #23 from delasky/newBecca

New becca
commiting changes to engine.js
merge conflicts
Merge pull request #25 from delasky/danielworking

Danielworking
Merge pull request #26 from delasky/master

syncing