Merge pull request #1 from RoseTeam/Strategy

First commit: Initial software architecture