Merge pull request #1 from BlockadiaTeam/master

Merge pull request #2 from pslam92117/master
Merge pull request #3 from pslam92117/master

Merge pull request #1 from BlockadiaTeam/master
Merge pull request #4 from yang6lang1/master

new request
Merge pull request #2 from BlockadiaTeam/master

Update
Merge pull request #7 from yang6lang1/master

Issue #5 is fixed
Merge pull request #8 from pslam92117/master

Merge pull request #2 from BlockadiaTeam/master
Merge pull request #3 from BlockadiaTeam/master

Update 2
Merge pull request #10 from yang6lang1/master

NewShapeWindow is finished. But there is a lot of room for improvements.
Merge pull request #11 from pslam92117/master

.
Merge pull request #12 from BlockadiaTeam/master

Patrick branch
added PreviewPanel
PreviewPanel is finished
Nightly Commit
Updated Icons
80% done with Edit function
Nightly Update (Edit Function)
Merge pull request #14 from BlockadiaTeam/Alex-Branch

Game panel branch
PreviewPanel finished
Save point: Start working on game board physics
Todo list:
1. Finish writting the test driver for Config.java to make sure it's
working as expected before implementing the game engine
2. Start working on the game engine followng the template of
testbed(Make the zoom out zoom in first)
Reverted back to previous commit