Synced through github app

gitignore updated? so yeah
Insignificant commit

Stupid conflict with gitignore
Merge origin/master into mike