Merge branch 'sid'
Merge branch 'master' into sid
User name info in index and user name search added
ting
erge branch 'master' of https://github.com/natewinn/spendless into sid
asdfasf

s

i
Merge pull request #19 from natewinn/sid

Sid
Account functional
Merge pull request #21 from natewinn/sid

Account functional
updates conflicts