..
..
Merge branch 'master' of
https://github.com/kiseok7/python-flask-bootstrap.git

Conflicts:
	.project