Site Class
R and support jar
Upload logo
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/com/dlsu/savant/R.java