Fix merge issues
Merge branch 'master' of https://github.com/kevinchian/Project3
Tray moves has null pointer. TrayTest updated.