start of users page
merging issues
basic functionality for search
Merge branch 'development' of github.com:climbingcode/bam- into development