Michael: PULL THIS NOW, either me or Eric screwed up the repo so i reverted to
	 the last commit and added all new changes and updated everything.
	 (If you have commit problems merge)