no message
no message
no message
Merge branch 'feature/peony'

Conflicts:
	pages/index.html
	pages/style/css/main.css
	pages/style/css/main.css.map
	pages/style/css/main.min.css
	pages/style/sass/main.sass
Removing some bugs
Merge branch 'master' of https://github.com/trakout/TeamBananaStand.Submission
Off by one exception
A few more changes to user_info_service
Merge branch 'master' of https://github.com/trakout/TeamBananaStand.Submission
adding preliminary datadog
Merge branch 'master' into front_end