added
added
deleted favicon
changed some things
changed key
production
added asset manifest
css test
all the things
testing assets
Merge remote-tracking branch 'upstream/master'
removed email template, too much for now
added stuf
Merge remote-tracking branch 'upstream/master'
couple changes
Merge pull request #22 from cenderin/master

STUFF HAPPENED
Tested all profile controller actions
improvements to the about page
Made calendar route action and view
fixed mege conflicts