Fixes
Merge branch 'master' of github.com:tashenka/shaker

Conflicts:
	index.php