Add screenshot support
Merge branch 'master' of https://github.com/mattburch/pam

Conflicts:
	public/views/edit.html
Updated Martini go path
Display corrections
Readme updatey