another one commit
Merge branch 'master' of https://github.com/Rosstik/python-flask

Conflicts:
	someanothercode.txt

trying to solve files conflict