Adding another commit to master.
Fixed merge conflict during git rebase -i test
2nd change in testing git rebase -i with new-feature branch
Merge branch 'new-feature' of github.com:haytham/gittest into new-feature

Conflicts:
	app.py