Initial commit
Merge branch 'master' of github.com:iest/ballin-octo-tribble

Conflicts:
	.gitignore
	LICENSE
	README.md
Merge branch 'master' of github.com:iest/ballin-octo-tribble
Merge branch 'master' of github.com:iest/ballin-octo-tribble
template and styles