limit 50 mb
mcMerge branch 'master' of https://github.com/amolc/icefire

Conflicts:
	icefireapp.js
mc