workaround for ant being a pile of fail
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/screens/index.js