Basic structure
Merge branch 'master' of github.com:miguelgr/flask-boilerplate

Conflicts:
	.gitignore
	README.md