reg + views
Merge branch 'master' of https://github.com/wreardan/kitty2013 into project2