Gitignor
Merge branch 'SnappingProto'
SnappingPrototype: Fixed comment
Callback: Removed useless type parameter
Merge branch 'SnappingProto'

Conflicts:
	LogicBox/src/snappingProto/SnappingPrototype.java
Removed duplicate snappingPrototype
Merge branch 'master' into SnappingProto
SnappingPrototype: Removed magic number
SnappingPrototype: Fixed bug for right snapping