Removed files that should be ignored, bug #31 solved, and removed scripts duplicated
merge