fix line
add images to progress bar
fix so images don't show when there is not that kind of activity
fix so images don't show when there is not that kind of activity
merge upstream master
Merge pull request #39 from Hilaryous/activities-page

Activities page
Merge pull request #38 from allisonlarson/user_show_page

User show page
merge with master
New Rakefile solution
Merge branch 'master' of https://github.com/tyrbo/tunefish into activities-page
user images exist on user index and show
Deployment IP address is now a constant and not hardcoded. The migrations container should now be removed after being run each time.
Docker images should now download concurrently to all CoreOS servers.
Return 422 instead of letting the server blow up with no current_user
Merge pull request #40 from wfro/master

Return 422 instead of letting the server blow up with no current_user
Merge branch 'master' of https://github.com/tyrbo/tunefish into user_images
Add spec and routes for externally facing API
Add users#index, users#show, and users/activities#show for external API
External API endpoint for all activities
Add external API endpoint for all activities