Remember to save all files before commiting >.<
Merge branch 'master' of http://github.com/stianwe/Janis-mate