gitignore
funtimes
fixed conflicts
final updates