Added tips and logo, integrated napping, and fixed bugs.
Merge pull request #4 from asr716/master

Merge for 2nd iteration