Initial import.
Merge branch 'master' of https://github.com/ametke/govhack2013

Conflicts:
	.gitignore