Merge remote-tracking branch 'origin/stage'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/tiffena/815

Conflicts:
	README.md