Changed style according to coding guidelines.
Merge branch 'master' of https://github.com/arya-s/imouto

Updated coding style according to guidelines.