Edited v2
Merge branch 'master' of https://github.com/megha89/Documentation

Conflicts:
	Flairs/flairsPaper.tex