launch changes
finished up merging. should be good
Merge branch 'launch'