Displaying year and Enem subject pulldowns
Enabling additional filters in main page
Resolving merge conflicts