Squashed commit of the following:

commit e18537aa845cee8a1f7d0f3b26f59b54e6b8130e
Author: Karl Akert <kpakert@gmail.com>
Date:   Tue Feb 19 11:52:30 2013 -0600

    Compiled and ran the code

    The code succesfully comiles and runs, showing the player ship at the proper position

commit 363153ea6561d5294f1e39e42181a261dda958b9
Author: Karl Akert <kpakert@gmail.com>
Date:   Tue Feb 19 11:28:03 2013 -0600

    Updated game1.cs

    I added an initialization, load content, and draw information to game1.cs for the newly created player.cs

commit c3dcad1c23c81d416814edd2c4d4c5cf39a38ccb
Author: Karl Akert <kpakert@gmail.com>
Date:   Tue Feb 19 11:13:41 2013 -0600

    Updated the player class

    I added some instance variables to the player class and updated the Initialize() and Draw() methods.

commit 74a60183da4e084b3441ab5ef3fdb7c00398da37
Author: Karl Akert <kpakert@gmail.com>
Date:   Tue Feb 19 10:57:42 2013 -0600

    Adding class Player.cs

    I added the skeleton for the player class, initialize(), Update(), and Draw()
Merged and fixed conflict

The conflict was simple, wondering how to make  this not happen in the future, for example I always just want to choose the develop branch's version

Conflicts:
	Shooter_Project_Windows/Shooter/Shooter/Shooter/Game1.cs
Merge remote-tracking branch 'origin/develop'

Conflicts:
	Shooter_Project_Windows/Shooter/Shooter/Shooter/Game1.cs
Merge remote-tracking branch 'origin/develop'

Conflicts:
	Shooter_Project_Windows/Shooter/Shooter/Shooter/Game1.cs
Merge branch 'develop'
Merge branch 'develop'