added ignore file to ignore temp files
display survey stats with charts
Merge branch 'master' into survey_stats

Conflicts:
	public/css/application.css
	public/js/application.js