Merge pull request #33 from JBrianGordon/jamesbranch

changes the user info on the venues show page to link to their user prof...
insert angular and add user pics to reviews
Merge branch 'master' into brianbranch

Conflicts:
	app/views/venues/show.html.erb
merge you jackass
Merge pull request #34 from JBrianGordon/brianbranch

insert angular and add user pics to reviews
makes the website links functional
Merge branch 'master' of https://github.com/JBrianGordon/WhAttire into linkfunctionality
Merge pull request #35 from JBrianGordon/linkfunctionality

Linkfunctionality
userinfo changes
Merge pull request #36 from JBrianGordon/userinfo

userinfo changes
hides picture from venue index if none exists
makes the search box work and appear
Merge pull request #37 from JBrianGordon/userinfo

makes the search box work and appear
fix some tests
makes progress towards implementing venue categories, doesn't actually work yet
Merge pull request #38 from JBrianGordon/brianbranch

fix some tests
Merge branch 'master' into kellybranch
Merge pull request #39 from JBrianGordon/kellybranch

makes progress towards implementing venue categories, doesn't actually work yet
takes out broken categories shiz
Merge branch 'master' into kellybranch