Ignores vi swap files
Ignores vi swap files
Merge branch 'master' of http://github.com/tamasgal/royweb

Conflicts:
	.gitignore
Merge branch 'master' into packaging
Changes directory structure for static files