Layout
Merge branch 'master' of https://github.com/kickasshackaton/kickass_hackaton

Conflicts:
	kickass/templates/main.pt