Merge pull request #45 from juanlizarazo/Allenardo

Fixed indentation. Pay attention to it for the cleanest code possible, in the future!!
Best solution possible! :D
addresses issue #44 fixes picture flickering but needs function moved to chat_controller