Initial commit
Test 1

Just a test to see if I understand how to use this newfangled git.
Revert "Test 1"

This reverts commit c33e2a4099a255950d56609dde179114abc1ab1e.
Revert "Revert "Test 1""

This reverts commit d6da2e681c5557bbef26776e3fac4dd995724661.
Merge pull request #1 from CS-196-Space-Colonization/economics

Economics
Commit #1 During Hack-athon

My addition of the player class and other nessesary subclasses, unit,
reputation, rep, location, technology, trade, map.
Bad Commit

Ignore
Revert "Commit #1 During Hack-athon"

This reverts commit bcb8074ed4c0afcf7fa667a9cbd376b519f3b27a.

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/Main Game
Code/.indexes/e4/28/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Main Game
Code/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/4.tree

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3805622446.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
Undoing

Ignore
Re-Commiting #1

See Commit #1 Description minus misc. files
Merge pull request #2 from aguerrero15/AI---Arturo

Ai - Arturo Test Commit Merge
Revert "Ai - Arturo Test Commit Merge"
Merge pull request #3 from CS-196-Space-Colonization/revert-2-AI---Arturo

Revert "Ai - Arturo Test Commit Merge"
Test Commit
Merge pull request #4 from DrOctagonopus/master

Test Commit
First military classes
Deletion
Adding gitignore

Adding gitignore
Merge branch 'master' of https://github.com/CS-196-Space-Colonization/Game