ignoring kate-swp files
Merge branch 'HEAD' of https://github.com/TrueFurby/perk-up
added /room
Merge branch 'HEAD' of https://github.com/TrueFurby/perk-up

Conflicts:
	html/home.html