all files
Merge pull request #4 from Manishearth/master

All code except presentation