Merge pull request #106 from RobertBColton/master

Rewrote Models
fixes struct errors
Added room_set_* functions.
Merge remote-tracking branch 'upstream/master'