fixed permissions timeout
Merge branch 'master' of https://github.com/trakout/TeamBananaStand.Submission
Merge remote-tracking branch 'origin/feature/peony'

Conflicts:
	pages/js/min/main.min.js
- made the names smaller (slightly higher change of collision, but meh)
start.sh commenting out node shit
added start.sh to gitignore
Changed bracket
More readme changes
no message
Merge branch 'master' into feature/peony

Conflicts:
	pages/js/min/main.min.js