bug fixing
fixed some sizing bugs, added bottom nav for events, basic styling on category filter
merge
testing get request from a server
Merge branch 'master' of github.com:WesAppGroup/prototype