Merge pull request #371 from pachalad/master

Tests and stuff
Slight changes to upvoting
Merge pull request #372 from iameric1986/master

Slight changes to upvoting
Carly fixed the camera
Merge pull request #373 from iameric1986/master

Carly fixed the camera
Fixed the LOAD MORE algorithm so that it loads from the correct position
Grabbing Dom's test suites

Merge remote-tracking branch 'upstream/master'
Merge pull request #374 from iameric1986/master

Fixed the LOAD MORE algorithm so that it loads from the correct position
Merge remote-tracking branch 'upstream/master'
Removing dead methods and classes
Merge pull request #375 from iameric1986/master

Code clean up
cleaning up and java docing
added javadocs and cleaned up code not needed
Merge pull request #376 from rjynn/master

created javadocs and cleaned up code not needed
added some javadocs
Merge remote-tracking branch 'upstream/master'
Merge pull request #377 from rjynn/master

added javadocs
FUCK YOUR MERGE CONFLICTS RUBY
FUCK YOUR MERGE CONFLICTS RUBY
Merge pull request #378 from iameric1986/master

Fixed merge conflicts