Merge branch 'highpriority-james'
dfgdg
dfg
dfg
dfg
dfg
dfg
Merge branch 'master' into highpriority-james
Merge branch 'highpriority-james'
Relates project types to projects in the UI
Supports search in project name
Adds project type support to search
More seed data, minor new features
Adds heroku seed data
Adds java and angularjs seed data
adds photoshop
adding binding.pry to gem
adding related projects functionality
adding related projects to tools page
Merge branch 'master' of github.com:ChooChooo/testing