Added blank element class
Merge remote-tracking branch 'origin/Mark'

Conflicts:
	PacManMulti/PacManMulti/Logic/GameLogic.cs
	PacManMulti/PacManMulti/Logic/GameLogicClassic.cs

Merging after fixing conflicts
Merge branch 'mark'

Conflicts:
	PacManMulti/PacManMulti/Logic/GameLogic.cs
	PacManMulti/PacManMulti/Logic/GameLogicClassic.cs

updated
Made some updates to the game logic

Updated Game Logic to be an interface and started implementing classic
rules
Cleaning up

Fixed enums and some using issues
Don't know what changed, but I need to pull.
Fixed numerous compilation errors. Working on score logic.
Trying to iron out the bugs

Fixing bugs squish squish squish
Merge remote-tracking branch 'origin/Micah' into Micah

Conflicts:
	PacManMulti/PacManMulti/Controllers/InputInterface.cs
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Elements/Ghost.cs
	PacManMulti/PacManMulti/Elements/PacPlayer.cs
	PacManMulti/PacManMulti/Game.cs
	PacManMulti/PacManMulti/Logic/GameLogic.cs
	PacManMulti/PacManMulti/Logic/GameLogicBattle.cs
	PacManMulti/PacManMulti/Logic/GameLogicClassic.cs
	PacManMulti/PacManMulti/Logic/GameLogicTag.cs
	PacManMulti/PacManMulti/Logic/Node.cs
t

t
Merge branch 'bos' of github.com:TeamAwesome5u/Pacman into bos

Conflicts:
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Elements/PacPlayer.cs
	PacManMulti/PacManMulti/GameMaster.cs
	PacManMulti/PacManMulti/Logic/Board.cs
	PacManMulti/PacManMulti/PacManMulti.csproj
	PacManMulti/PacManMulti/UI/BoardUI.cs
	PacManMulti/PacManMulti/UI/SpriteDemo.cs
Updating some logic and trying to fix my branch
updateing things
Merge branch 'Micah' of https://github.com/TeamAwesome5u/Pacman into Micah

Conflicts:
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Elements/PacPlayer.cs.orig
	PacManMulti/PacManMulti/Logic/GameLogicClassic.cs
	PacManMulti/PacManMulti/Logic/GameLogicTag.cs
	PacManMulti/PacManMulti/Logic/Node.cs
Merge remote-tracking branch 'origin/Micah' into Micah

Conflicts:
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Elements/PacPlayer.cs.orig
	PacManMulti/PacManMulti/Elements/PacPlayer.cs.orig.orig
	PacManMulti/PacManMulti/Logic/GameLogicClassic.cs
	PacManMulti/PacManMulti/Logic/GameLogicTag.cs
	PacManMulti/PacManMulti/Logic/Node.cs

finally!
Merge remote-tracking branch 'origin/Micah' into Micah

Conflicts:
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Elements/PacPlayer.cs.orig
	PacManMulti/PacManMulti/Elements/PacPlayer.cs.orig.orig
	PacManMulti/PacManMulti/Logic/GameLogicClassic.cs
	PacManMulti/PacManMulti/Logic/GameLogicTag.cs
	PacManMulti/PacManMulti/Logic/Node.cs
still fixing complie errors

Fixing more bugs
Finally no more compile time errors

I finally got rid of all the complie time errors. Now to get everything
workin together...
Merge pull request #11 from TeamAwesome5u/master

Updating Louis
working on adding time,

Need to commit so I can get a compling version of master.