try6
Merge branch 'master' of https://github.com/JordanLingHua/cs113Project

Conflicts:
	cs113Project/Library/CurrentLayout.dwlt
	cs113Project/Library/assetDatabase3