before merge
Merge remote-tracking branch 'origin/front_and_backend' into styles2
soundcloud and twitter styled
soundcloud search added
Merge branch 'front_and_backend' of github.com:dennisjs0910/mesh into front_and_backend
pull latest push
branching off to finished everything except reddit
solved conflicts in reddit/comments.html.erb
attempting second push