12-29-2014 Commit
Merge branch 'master' of https://github.com/retrorider/notes