timer
timer css
Added inputosaurus using jquery-ui
foundation layouts
Merge branch 'master' of github.com:danlinde/sifiapp

Conflicts:
	app/assets/javascripts/application.js
	app/views/events/new.html.erb
	app/views/events/show.html.erb
	app/views/pages/index.html.erb
	app/views/shared/_event_form.html.erb
last change