commit to pull
Merge branch 'master' of https://github.com/dcstone09/CS480Pie
commit to pull
Merge branch 'master' of https://github.com/dcstone09/CS480Pie

Conflicts:
	mvc/views/pie/index.html.php
commit to pull
Merge branch 'master' of https://github.com/dcstone09/CS480Pie
Merge branch 'master' of https://github.com/dcstone09/CS480Pie

Conflicts:
	mvc/views/pie/index.html.php
Merge branch 'master' of https://github.com/dcstone09/CS480Pie
draws pie