Created the "proposed" branch for better organization
Moved Tianyu's proposals (thanks for the ideas!) in the README
    to the proposed branch
using Scala Trait App
Merge branch 'master' of github.com:gamel/gamel
Merge branch 'proposed'

Conflicts:
	README.md
	src/main/GamelMain.scala
Delete SampleTest.scala

Replacing Sample.Test.scal with GamelTest.scala
Create GamelTets.scala

Added tests for all that we have implemented so far. Also includes tests for actions, which I will merge in soon
Rename src/GamelTets.scala to src/test/GamelTets.scala
Update and rename SampleTest.scala to GamelTest.scala

Added tests to proposed branch
Merge branch 'master' into SAGSL
Merge pull request #5 from gamel/proposed

Update and rename SampleTest.scala to GamelTest.scala
Added tests to SAGSL. They need to be updated
Update README.md
Merge pull request #6 from gamel/master

Merge tests and readme correction back into SAGSL