Initial commit
Merge branch 'master' of github.com:grantoz/app

Conflicts:
	.gitignore
Add static pages controller
Add static pages