Adding glossary

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>
Merge branch 'dev' of https://github.com/liloQui/reader into dev

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>

Conflicts:
	app/scripts/controllers/liloqui.js
	app/scripts/views/liloqui.js
	app/styles/main.css
	app/templates/liloqui.html