assits field added
fix on attendant form
Merge branch 'master' of github.com:jvacx/andycamp

* 'master' of github.com:jvacx/andycamp:
  Update _modals.html
  Update _modals.html
  Update _about_event.html
  Update _about_event.html
Merge branch 'master' of github.com:jvacx/andycamp

* 'master' of github.com:jvacx/andycamp:
  Update _about_event.html
coming soon cronograma
under construction
insane
Merge branch 'master' of github.com:jvacx/andycamp

* 'master' of github.com:jvacx/andycamp:
  Update _modals.html
  Update _modals.html
  Update _modals.html
  Update _modals.html
  Update _modals.html
  Update _navbar.html
  Update _about_us.html
  Update _slider.html
  Update _modals.html
  Update _about_event.html
  Update _cronograma.html
  Update _about_event.html
  Update _modals.html

Conflicts:
	andycamp/templates/components/_navbar.html
Merge remote-tracking branch 'origin/master'

* origin/master:
  Update _modals.html
  Update _modals.html
  Update _modals.html
minor fix
minor fix for deploy
Merge branch 'master' of github.com:jvacx/andycamp

* 'master' of github.com:jvacx/andycamp:
  Update _slider.html
  Update _slider.html
  Update _slider.html
  Update _modals.html
cache and fixes
Merge branch 'master' of github.com:jvacx/andycamp

* 'master' of github.com:jvacx/andycamp:
  Update _modals.html
general fixes