more project management stuff
Merge branch 'master' of https://github.com/AaronMaisto/QuickMergeComp.git