merge

Merge branch 'prelaunch'
push merge to master
merge with master
merge in to master
update gitignore