Netbeans Cleaned it weirdly
Merge branch 'master' of github.com:pierfier/APCompSciAsignments

Conflicts:
	Grid_World_Works/nbproject/project.properties
Added Conway Package to Project
Reminder: never clean Grid_World Project