Test commit, please ignore
asdasdasd
Test push commit

Does this work?
Added Important Message about Life in Austin!

This is an important message that everyone needs to understand. Its a
message of love, life and peace.
Adding unimportant file

QQ
Merge pull request #1 from dranelol/master

PULL DIS
Merge pull request #4 from omnomchomsky/master

Added Important Message about Life in Austin!
Merge pull request #2 from velhelm/master

Adding unimportant file
Sure
Merge branch 'master' of https://github.com/flyingriffin/SpaceIsFun
Merge remote-tracking branch 'upstream/master'
Merge https://github.com/dranelol/SpaceIsFun

Conflicts:
	SpaceIsFun/Game1.cs

Updating local master branch
Fixing my own stupidity
adding subclasses for system rooms and some corresponding methods
adding child classes for system rooms and appropriate methods
Changing room status to state machines
Merge pull request #13 from flyingriffin/master

Adding state machines for the statuses of individual rooms