archive fall 2013 site plus gitignore
merge