before pulling Luis code
Merge branch 'master' of https://github.com/intuinno/lineup.js

Conflicts:
	demo/lineup_demo.js