Social Controls
File Convert
Merge branch 'master' of https://github.com/mnbbrown/doneapp into registerbuttons

Conflicts:
	templates/layout.html
Deleted files
Merge pull request #2 from mnbbrown/registerbuttons

Registerbuttons