commit

commit
Merge branch 'master' of https://github.com/anev/StatStudy2014

Conflicts:
	js/app.js