commit to pull
Merge branch 'master' of https://github.com/wmcn-fm/wmcn
commit to pull again
Merge branch 'master' of https://github.com/wmcn-fm/wmcn
Merge branch 'dev-main'

* dev-main: (45 commits)
  index layout
  working on index layout, review/blog posting, playlist layout...
  working on playlist page layout
  playlist.post completely working except for alert feedback
  stumped on flash alert...
  comment out sass until i can get it to actually compile
  playlist template working
  pushing to playlistColl but not redirecting to layout (routing problem?)
  add to artists working!!
  so close i can taste it......
  aaaalmost complete with artists, just duplicate songs...
  update readme
  pushing var name instead of  value to mongo...? // getHostName still undefined
  g2g
  added back in nodemailer-wellknown to package.json, apparently it's needed
  add faker.js to client
  Hard coded so that email is sent to will's and my email only right now
  nodemailer test seems to be doing fine
  commit to pull
  setting up js for faker
  ...
index layout..
halfway fixed applicants display problems
fix broken app (wysi5 problem)
Merge commit '548a6fd7279ce1d2de19811338686da2eda2ec22'

* commit '548a6fd7279ce1d2de19811338686da2eda2ec22':
  work more when i hear back
  fixed a little bug on index.js for the route signup/:bigUrl
  Confirmation code and bigUrl matchup successful, but will need to edit once approve slider works, need to implement an Ajax call now...
  having trouble with findOne syntax in index.js on signup/:bigUrl
  modified admin.js and applications.js to have a bigURL and a confirmation code, untested as of yet