add vendor prefixes
merge conflict with style.less
Merge branch 'master' of https://github.com/calvinfroedge/vote
update grunt file to include images; add new logo;
Merge branch 'master' of https://github.com/calvinfroedge/vote