to do
Merge branch 'master' of github.com:Nasto/SWE-App

Conflicts:
	README.md
Merge branch 'master' of github.com:Nasto/SWE-App

Conflicts:
	src/main/java/yoloswagswag/swe_app/pollActivity.java
	src/main/res/layout/poll_screen.xml
Merge branch 'master' of github.com:Nasto/SWE-App

Conflicts:
	README.md