Updating factories
Merge branch '3_creating_controllers' of timcgithub:timcmartin/ticketstub into 3_creating_controllers