Changed text
Merge branch 'development' of https://github.com/hamdanjaveed/UWAFT-Website into development
Merge branch 'development' of https://github.com/hamdanjaveed/UWAFT-Website into development
Added testimonial to the front page
Merge branch 'development' of https://github.com/hamdanjaveed/UWAFT-Website into development
Merge branch 'development' of https://github.com/hamdanjaveed/UWAFT-Website into development

Conflicts:
	root/home/index.html
	root/team/team.html