Replaced files that didn't push to github properly.
Merge pull request #1 from navitronic/master

Replaced files that didn't push to github properly.