updated ignore + added new file for caroline to play with
Merge remote-tracking branch 'origin/master'