getting new stuff
Merge branch 'master' of https://github.com/soldiercnorm/RIT48

Conflicts:
	index.html
Saving changes