add ignore file
init commit
Merge remote branch 'origin/master'

Conflicts:
	html/js/general.js
	html/js/modules.js
	html/london.html
	html/themes/core/general.css
	html/themes/london/theme.css