update read me
Merge branch 'development'

Conflicts:
	public/images/Thumbs.db
test closes
Merge branch 'development'
Merge branch 'development'

Conflicts:
	app/controllers/LeaguesCont.java
	public/images/Thumbs.db
merge
README
Merge branch 'master' into development