init
Um?
Second attempt at fixing initial commit
Maybe?
Merge branch 'master' of heroku.com:plr-about
I can't even tell if this is working
Conflicts:
	.DS_Store
	Procfile
	templates/plr_about.html
hu
eue
Hopefully??
Nope
huhu
what
Maybe this'll do it.
Getting closer