test changes in develop
resources in one method in checkincontroller
Merge branch 'develop' of https://github.com/oSoc14/hyperRail into develop
merge