Fixing controller bugs
Removing a flinpin' route
Merge remote-tracking branch 'origin/master'