Merge branch 'winks' of https://github.com/ABarnhard/celebridate
Merged Winks with new message controller
fixed error, readded verify routes
fixed routes
Merge branch 'master' of https://github.com/ABarnhard/celebridate into fixroutes
Part of resolving routes
Merge pull request #12 from ABarnhard/fixroutes

Fixroutes