ignoring files
Merge branch 'master' of github.com:squallooo/SongProject

        integrating michel's changes