Merge pull request #4 from trfergusASU/master

Pull request for accounts page
Did account page stuff mostly, aswell as a bunch of random stuff
Merge pull request #5 from ACKozell/andrew

Did account page stuff mostly, aswell as a bunch of random stuff
Merge pull request #2 from ACKozell/master

Merge master to mine