ignore .swp files in .gitignore
ignore files that end with "~"
Merge branch 'master' of https://github.com/abangratz/penpusher-admin

:q
Merge branch 'master' of https://github.com/abangratz/penpusher-admin

Conflicts:
	.gitignore

:q