Add voting info to poster
Resolve conflicts
Update action plan and organize repo