commit before go to dev branch
Added a .gitignore
Merge branch 'gh-pages' of https://github.com/decause/360in180 into gh-pages
Merge branch 'gh-pages' into develop

Conflicts:
	.gitignore