changing filename
new files
removing plain text file
new files
template files
Merge branch 'master' of github.com:lsaffie/worklog

Conflicts:
	20140510-Sat.otl
	new.rb