Merge pull request #188 from BU-CS673/Canfield

Canfield -> Canfield-Staging
Merge pull request #189 from BU-CS673/Canfield

Removed auto-created merge conflict files
Merge pull request #192 from BU-CS673/Canfield

Copyright notice is now listed in header
Merge pull request #193 from BU-CS673/Canfield

Last one: Removed unused params in Tank.fireCannon [Didn't see this problem earlier]
More preferences updates

- Workspace specific preferences weren't exported
Merge pull request #194 from BU-CS673/Canfield

Bullet movement implemented
Fixed more javadocs; Removed unnecessary tests

Converted a number of unit tests to use JUnit assertions, rather than
the java assertion mechanism, which is often not active during unit
tests (depending on settings).
Merge pull request #190 from BU-CS673/Canfield-Staging

Canfield-Staging -> production
Merge pull request #199 from BU-CS673/production

Production -> Canfield