luka - create
luka finish
Merge branch 'master' of https://github.com/luxxi/shakal.git

Conflicts:
	LastManStanding/create.html
Merge branch 'master' of https://github.com/luxxi/shakal.git

Conflicts:
	LastManStanding/create.html
	LastManStanding/index.html