Added Luke's upgrade icons to the 9 available upgrade slots
Pause Dialog working

Paddle working
Merge pull request #2 from TeamTileBreak/Game

Pause Dialog working
Added SharedPref placeholders

Should be easily implemented
Added SharedPref placeholders

Don't think the double upgrade activity problem exists in this file, need to check...
Added appropriate UI connections, deleted unnecessary files.
Upgrade no longer called multiple times, added same fix as pause, just a boolean.  The problem is that with a single screen touch, multiple instances of the same screen touch are called, can be seen if you uncomment the logcat messages
Fixed a couple bugs with Upgrade
Fixed a few odd bugs in Pause
Added a finish to Main
Added onBackPressed functionality 

Need to add this to the other activities
Added another finish, now there are no redundant instances of mainActivity.
Removed upgrade button from TileBreakerActivity
added IML to gitignore
Merge branch 'master' into Upgrades
Basic Game working
Merge branch 'master' of https://github.com/TeamTileBreak/TileBreaker

Conflicts:
	app/src/main/java/edu/uark/csce/tilebreaker/TileBreakerActivity.java
Merge branch 'master' into Upgrades
Working on Dragon Drop (RAWR)