bollocks
merging master to curr branch
created views and adjusted actions to render next
WIP radio buttons
NO CONFLICT WHOOO
Natasha is leaving us.
Renamed files
Merge branch 'natashabranchv5' into ting_branch_4