need to merge
Merge branch 'master' of https://github.com/davidgaskins/326
Merge branch 'master' of https://github.com/davidgaskins/326
mostly done,need to work on printing