Moving paid button
add home link
Merge remote-tracking branch 'upstream/release-1' into release-1
fix notice merge conflict
Getting sound files to play in Dashboard
Cleaning out unused photos
Remove filler text
Fixing bugs and merging.
Merge conflicts
Merge and delete plain html files
reorganizing dashboard
Almost ready Show the world what I've done
Add mandrill keys
fixed merge conflicts
Add host param for email
change from in registration mailer
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge branch 'master' into release-1
Bringing in real data
Bringing in real data