Merge pull request #114 from thatcoderguy/master

Merge Changes
Added unit tests + fixed some bugs
Refactored login and registration code
Refactored large if statements + added alt views for emails
More refactoring
More refactoring
Merge pull request #121 from thatcoderguy/Development

Development pull