Merge pull request #61 from aqlien/Foundation

Foundation
begin writing more tests
fix merge conflicts
Fix pet panel header text hiding under logo.
add more thorough tests
Delete application.yml
Add custom font.
Merge from upstream.
Merge from upstream... again. WTF git.