Cleared accidently merged files
Revert "Cleared accidently merged files"

This reverts commit fd0b29f9423790a6a2d7511eb4b09f9746a5f519.
added some files
changed some files
Revert "changed some files"

This reverts commit bcb6a414a67a6a8a58ea73ae6b592a045d62069c.
Revert "added some files"

This reverts commit 2ba24de6297be5c1dec6951a96f0740a0f0be717.
Removes incorrectly labeled folder
Removes weird binary file
Fixes stuff
Merge pull request #155 from ah450/master

Fixes Master
Issue #169 create poll form
Revert "Issue #169 create poll form"

This reverts commit 61e1841cb860450cc79d21eba0fe86e2f15f7653.
some changes
Revert "some changes"

This reverts commit a9e7449ca8d3aa2fe1b8d769fc514d9197797a83.

reverting a commit
Merge branch 'master' into development