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

Conflicts:
	src/MemeMaker.java
changed sizes of buttons and labels
remove focus from buttons
repositioned logo
Changed preview image popup method name