Merge pull request #69 from HoltMaki/master

format
Merge pull request #70 from HoltMaki/master

Update README.md
Merge pull request #71 from HoltMaki/master

Delete CAH_Window.java
Merge pull request #72 from HoltMaki/master

stuff added to enum and ui
Merge pull request #73 from HoltMaki/master

end of todays APCS
Update TODO
Delete THREADS
Merge pull request #13 from PurpleKangaroo/master

pull