Merge pull request #5 from josephbooth/master

Pull Request
Fixed broken box
playing with cookies
Merge pull request #6 from josephbooth/master

passwords
password
Merge pull request #7 from josephbooth/master

last one for the night
removed password_reset
huh?
huh
...
Merge pull request #12 from josephbooth/master

Daily Update
Merge pull request #2 from stalderc/master

Getting Cameron's changes