angular loading gdoc added
Merge branch 'master' of https://github.com/aldogroup/gdocTojson

Conflicts:
	css/base.scss
	css/foundation.scss
	css/main.css
	css/main.scss