Testing conflicts
Merge branch 'master' of https://code.google.com/p/space-factory

Resolved conflict in readme.txt.

Conflicts:
	readme.txt
Configured basic qtcreator project. Basic program files added.
Testing conflicts
Merge branch 'master' of https://code.google.com/p/space-factory

Conflicts:
	main.cpp
TEST: committing with Mac
Added the team members to the readme.txt
Changed members to integrants.
Fixed misspelling in readme.txt
Merge branch 'master' of https://code.google.com/p/space-factory
fixed conflict.
Conflicts:
	readme.txt
Deleted the readme.txt~
Created an images folder to save all the images on the project.
Added a bunch of spaceship images and a spacestation image.
Added the resources directory.
I'm done. Finished setting the background.
Merge branch 'master' of https://code.google.com/p/space-factory
Removed .swp file.
added a bunch more images. Added images to resource.qrc.
Updated LISENSES.txt with image files.
I didn't see a background when I opened it, so I added the background by editing the style sheet of the central widget.
Created file model.h and put current (incomplete) design pattern into that file correctly formatted
edited the code on mac and found that the program still worked fine on the Lab VM, so I'm going to just work on Mac. Makes me sooooo happy :)