Initial project commit
Merge branch 'master' of github.com:andrew-codes/angle-brackets-post-conference

Conflicts:
	.gitignore