testing new gitignore
Merge branch 'master' of https://github.com/fezzee/LineupUI

Conflicts:
	lineup.json