syncing latest project
adding ignore
syncing again
updating
moving things around
updating files
Merge remote-tracking branch 'origin/master'