Testing
Added initial framework
Merge branch 'master' of github.com:gpu-team1/finalProject