added to roster
Merge branch 'master' of git://github.com/annaswigart/i290m-ocpp-site into annaswigart-master
Fix formatting of Tony's assignment 1
Fix links in Anna's assignment 1
Fix links in Peter's assignment 1
Improve spacing in Stefan's assignment 1
Fix slug, location and links in Seema's assignment 1
Fix links in Andrew's assignment 1
Fix references in Andrew's assignment 1
Fix reference links in Andrew's assignment 1
added to roster againvi pages/roster.md
added to roster again
added to roster again
added details about the project
changing date on the lab
Merge pull request #73 from prabhamatta/a1

Added prabhamatta details about the project
Merge branch 'fix-assign1-tony' of git://github.com/antineutron/i290m-ocpp-site into antineutron-fix-assign1-tony

Conflicts:
	content/Assignment1.md
	content/assignment1/Assignment1.md
	content/assignment1/pnguyen-assign1.md
	content/assignment1/sputhyapurayil-assign1.md
Merge branch 'master' of git://github.com/annaswigart/i290m-ocpp-site
Merge branch 'annaswigart-master'
updated office hours