Merge pull request #1 from CS320/master

Proposal outline
test commit changes
Card is gone
Setup of Creep Class and methods
re-Setup Creep and Board Classes
Merge pull request #2 from pholtz/master

getting junit class
Merge branch 'master' of git@github.com:dbosenba/magicprogram.git
Merge pull request #1 from pholtz/master

Pull for JUnit
Merge pull request #3 from pholtz/master

update game render condition
Merge pull request #4 from mcifelli/master

updating entity class
Lastest version 2/15/13 goal, life, and overlap
Merge pull request #3 from dbosenba/master

Pull Request