ticketing on normal user side
Merge branch 'develop' of github.com:jingar/victory_lies_ahead
Merge branch 'develop'
Automatic schedule semi-works. Displays team memory location or something. Does not add to db. The scheduling itself works
conflit resolution
merge develop with master
Merge branch 'develop'
added resource heats to routes