Added more stuff to Outside, added functionality to Home
s
asd
asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Home.java
	src/Outside.java