testing -a command
Merge branch 'staging'

Conflicts:
	index.html
fixed issues with merging in index.html
Merge branch 'master' into staging
fixing issues