gitignore
Merge pull request #1 from ksl0/frontend

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

Conflicts:
	.gitignore