Merge pull request #5 from alexYer/alexYer

moved fps counter to Controller
Merge pull request #6 from NikitaSmall/dev

Dev
fixed .gitignore
camera fix
removed .idea/* and out/*
fixed .gitignore
camera fix
removed .idea/* and out/*
Merge branch 'dev' of https://github.com/alexYer/TempCannon into dev