added timestamps for beginning and end of nap
Merge branch 'master' into greg

* master:
  Corrected formatting.

Conflicts:
	app/views/nap.blade.php
timer files
Merge pull request #30 from hipsterwannabe/greg

Greg