New
Merge branch 'master' of https://github.com/dukereborn/slask

Conflicts:
	version.txt