sudo
Merge branch 'master' of github.com:ReedWrite/cs439h_f14_p12

Conflicts:
	user/login
Merge branch 'master' of github.com:ReedWrite/cs439h_f14_p12
Sudo.