gitignore
test few-modifications
Merge branch 'master' of https://github.com/ksl0/flaskProject into api

Conflicts:
	.gitignore
Merge pull request #2 from ksl0/api

Api