Merge branch 'feature/reservation' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 6 Nov 2018 18:47:44 +0000 (13:47 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 6 Nov 2018 18:47:44 +0000 (13:47 -0500)

Trivial merge