changed model: added female, male, student, teacher to categories
copied voting code - part 1
added selectable groups to category
added entity relationship diagram
added active_filters method to category
added method to get first 3 votes by voter and category
added replace for cat_description method
refactored voting#choose
removed duplicate cat description from voting#list view
added giif folder to .gitignore

giif = git ignored intern files
fixed voting
added mockup for voting site
merged first and last name into one name column
added error view for voting
added voting#commit
Merge branch 'integrate_voting'