initial commit
Merge branch 'master' of github.com:andersrex/angelhack2013

Conflicts:
	.gitignore
gitignore stuff