Revert "add src file and rename"

This reverts commit 3cfd328aabc51c909fcd5138af101a5f7853a06d.
Revert "Revert "add src file and rename""

This reverts commit 534650950e2ad875f8dd36980895d9be48d8fd11.
Merge branch 'master' of https://github.com/jermkeel/delhack2014