literally nothing
Merge branch 'master' of https://github.com/cs147win2014/project

# By mnburkle (3) and Isabelle Woodrow (2)
# Via mnburkle
* 'master' of https://github.com/cs147win2014/project:
  changed formatting so as to waste less space
  many different logos. ugh.
  fixed signup back to quickcalc
  fixed login back to quickcalc
  added explanation for the pills