first commit
Glued controllers with views, wip content to add
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	README.md