resolved huge merge issues; added check boxes to voting, added fully formatted comment section