new gemfile trying to squash bug: no implicit conversion of nil into String
adding readme2 to the directory
last of the olde dos
Merge branch 'master' of github.com:ml242/dossier

Conflicts:
	Gemfile
	Gemfile.lock

  BOOM rails is gone.
Merge branch 'master' of github.com:ml242/dossier
Your Name: Matt

Subject Line: Screwing around

What Happened:
trying to get this to work, need to recheck package json to make sure the dependencies are in order
onClick doesn't exist with ember, nice try buddy