Merge pull request #5 from slychika/master

Fixed some formatting...
added stuff
Merge pull request #6 from caitlinhickey/master

Added newest version of the paper