Bumped version to 0.0.3
Fixed conflict
Added files to gitignore