Merge remote-tracking branch 'chad/master'
Finally got memdeck into the main project
Merge remote-tracking branch 'chad/master'

All of chad's changes
Got rid of the pesky .git ignore thing
Lots and Lots of changes involving makeing the ui print the deck
pictures
Changes to MemDeck that don't work
Got the images printing to the screen
Merge remote-tracking branch 'shamor/master'

Conflicts:
	.gitignore
Major progress made in printing the Cards to the screen randomly
Merge remote-tracking branch 'Sam/master'