Update .gitignore

Updated from the L02 preparation folder in class.
Update .gitignore

Updated from the L02 preparation folder in class.
Merge origin/master

Conflicts:
	src/memory/Memory.java