seperated edit control panels
postioned edit controls absolute
absilute position edit controls
Merge branch 'styling'

Conflicts:
	app/views/events/_events.html.slim
removed extra fixed postion on modal
Merge branch 'master' into styling

Conflicts:
	app/views/events/_events.html.slim
Merge branch 'styling'

Conflicts:
	app/views/events/_events.html.slim
Working on notifications and a voted_on method for determining if the user has voted.
Merge
TEMPFILES removed