new branch called tasks need one
subTask done
Merge branch 'task' of https://github.com/sexypirate604/party

Conflicts:
	tasks/index.css
	tasks/index.html