working on adding user info to profile
Using another controller for pours.
Merge pull request #14 from wbyoung/josh

Using another controller for pours.
moved edit profile button
client tests all pass again