Merge pull request #8 from MikePaNtZ/development

Development
Couple code fixes before Midterm Demo

Removed shield push back feature. It is not ready.
Merge pull request #30 from Daikatana/master

Stuff we did before midterm demo