misc. changes to classpath/prefs
Merge remote-tracking branch 'kpike1Fetch/master'
Merge remote-tracking branch 'kpike1Fetch/master'
Merge remote-tracking branch 'kpike1Fetch/master'
Merge remote-tracking branch 'kpike1Fetch/master'
Added .classpath to .gitignore because the GWT is installed to different
places on each computer and is acting odd
Not sure what I'm doing :D
Revert "Added .classpath to .gitignore because the GWT is installed to different"

This reverts commit 1fe8234a008043ebc2615347d97951eccc702778.
Merge remote-tracking branch 'aroth4Fetch/master'
...
Merge remote-tracking branch 'aroth4Fetch/master'
Added Leaderboard page
...
Leaderboard changes
Merge remote-tracking branch 'nlay/master'
Merge remote-tracking branch 'tbibb/master'

Conflicts:
	HeatGem/.classpath
classpath
there should be no bin directory
Merge branch 'master' of git@github.com:nlay/HeatGem.git
unfinished merge?