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

Conflicts:
	.gitignore