removing project files
removing project files #2
Merge remote-tracking branch 'origin/master'
conflict
conflict! #2