first big commit
Merge branch 'master' of https://github.com/llsutherland/NFL

Conflicts:
	NFL.v11.suo