fixed merge issue
merge issues
changed carrierwave, changed views abit
more front end changes
Like button mostly done thx to John
added some pseudo code
event search by State added to public event page
changed show events
fixed merge conflicts from cenderin
fixed merge issues
scheme change
Merge pull request #35 from cenderin/master

search added
fixed merge issues
Merge branch 'master' of https://github.com/loganwbrown/art_eventz
css for event and profile show views