working on home
Merge branch 'master' into home-screen

Conflicts:
	src/MemeMaker.java