Merge branch 'master' into TeamCMU

This commit is contained in:
g-spacewhale 2017-11-18 10:03:13 +01:00
commit ce87ec7885

View File

@ -8,15 +8,11 @@ MPK Projekt Puzzle Solver
2, branch master into a team branch 2, branch master into a team branch
3, dont ever touch master again 3, work only in this branch
4, ..? 4, don't ever touch the master.
5, Profit Seriously. don't merge branch to master unless you are absolutely, 100% sure it works and you have discussed it with pm.
Seriously. don't merge branch to master unless you are absolutely, 100% sure it works!
# Current Todo # Current Todo