January 6/2014

Includes start of templates, after this commit I remove code for
template, and get it working properly with simple notes.