upload button for desktop
Merge branch 'master' of github.com:dashinfall3/Inspire_Me
Don't use superfluous subject
Merge pull request #36 from dashinfall3/s3

S3
merge confilts fixed
more style in the upload button for desktop
Merge pull request #37 from dashinfall3/omar

Omar
Add FeatureSpecHelper module in spec/support and include it for feature specs
Fix spec/features/static_pages_spec.rb
explore botton solved
Merge branch 'master' of github.com:dashinfall3/Inspire_Me into omar
Merge pull request #38 from dashinfall3/omar

Omar
Add custom have_link_to matcher
Refactor specs to use have_link to and make specs less brittle
sort profile sort explore'
Merge pull request #40 from dashinfall3/sort

sort profile sort explore'
fixed photo button
Merge pull request #39 from dashinfall3/brayden/fix-feature-specs

Fix broken feature specs
Added error message for failed user signin
refactoring css and views