forgott to branch out
Merge

Merge branch 'master' of github.com:sslash/codesnips
merged with master