:smirk: getting new study group on the way
Merge branch 'master' of https://github.com/RenderTeam/ateneo

Conflicts:
	public/js/app.min.js