Initial commit
Election Entities
styles.css file
RCPXBundle
rcpx as frontend bundle
Elections view
login styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Votolab/VotolabBundle/Resources/views/Home/index.html.twig
election view
Merge branch 'master' of github.com:albertolopez/votolab
login template
reset styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Votolab/VotolabBundle/Resources/views/Home/index.html.twig
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Votolab/RCPXBundle/Resources/views/Home/index.html.twig
assets instalation
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Votolab/RCPXBundle/Resources/views/Home/index.html.twig
Merge branch 'master' of https://github.com/albertolopez/votolab
reset styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Resources/views/base.html.twig
reset styles