add things
lol sleep
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of /opt/git/scout
reformat some team info stuff
Merge branch 'master' of /opt/git/scout
Merge branch 'master' of https://github.com/jeyoder/624scout

Conflicts:
	public_html/stylesheets/style/style-Main.css
	templates/TeamInfoTemplate.php
Merge branch 'master' of /opt/git/scout
add real error to matchInfo
Merge branch 'master' of /opt/git/scout
add real error to matchInfo