clean
Merge branch 'master' of github.com:K0F/2014