Merge pull request #2 from elliotec/development

so many changes
Merge pull request #3 from elliotec/development

Development
Added voteable ajax functionality
Merge branch 'development' of github.com:elliotec/codeunion into development
fixed merge conflict