Added usernames to sign_in and user/edit, validating presence and uniqueness
Merge branch 'master' of github.com:dmikeasem/giffer

Conflicts:
	app/views/posts/index.html.erb