getting factory girl
Merge branch 'master' of https://github.com/joewaine/virgin-space-program
Started search page
Conflicts resolved
Merge branch 'master' of https://github.com/joewaine/virgin-space-program
Fixed routes conflicts