#15
Fixed Merge Conflict
fixes #46
fixes and closes #46
Fixes #48 The first task
Fixes #48

Create a test piece .
Committing for backup #48
Merge branch 'master' into gravity
#48 returns null if out of range
Committing for backup

about to create a function to move a piece down
Merge branch 'master' into gravity
#48 tired
fixed merge conflict
Refactored Gravity Terminal #50
Created Simple Terminal Game #50
closes #50
Added workspace file, which may be useful for debugging
Changed the main project
Merge branch 'master' into BoardEditor

Conflicts:
	Test/nbproject/project.properties