Peerapat Luxsuwong
Merge branch 'develop' of https://github.com/R2-Team2/wpi-suite into develop

Conflicts:
	team_roster.md
Merge branch 'develop' of https://github.com/R2-Team2/wpi-suite into develop

Conflicts:
	team_roster.md