removed random files
fixed merge conflicts and added gitignore file
Merge pull request #2 from LaunchPadLab/removing_files

Removing files
Merge remote-tracking branch 'origin/master' into fine_tuning