Bundled up redundant code into setup() and fixed PlayerTurn logic. Created pop-ups for how-to, whose turn it is, and new round which are called through GameView. Fixed the GameActivity layout so that it displays best on all screen sizes.
Merge branch 'alex' of https://github.com/rabaut/project1
Things are looking pretty good at this point. I noticed a bug where the
falling animation isn't being translated properly when you scroll.

Conflicts:
	src/edu/msu/cruelworld/stacker/Game.java
	src/edu/msu/cruelworld/stacker/GameView.java
Game layout now properly displays on every screen size both horizontal and vertical. If we have time we might want to design another layout for horizontal for a better look
Merge remote-tracking branch 'origin/master' into chris
collapsing fixed, end game trigger not in and saving not implemented.
added cruel world text to game activity
Fixed the displaying player turn popup if block falls. Also increased rotation speed of the fall animation so it looks better
Merge remote-tracking branch 'origin/master' into chris
Score now updates and end game triggers
Our team name is now displayed in the title bar. Worked on rendering the scores, but there is a big delay in the score activity being started
Saving is working but Xscaling does not work in lengthwise view
Our team name is now displayed in the title bar. Worked on rendering the scores, but there is a big delay in the score activity being started
Finished up score screen
Merge branch 'chris' of https://github.com/rabaut/project1
Deleted unused sparty files, added in the icon
Fixed dropping and hit testing
Merge remote-tracking branch 'origin/master' into chris

Conflicts:
	src/edu/msu/cruelworld/stacker/Game.java
	src/edu/msu/cruelworld/stacker/ScoreActivity.java
Final Version
slight optimization
extra stuff