Added simple stuff for angular

Conflicts:
	flaskr.py