Timeline
Merge branch 'master' of https://github.com/tibus29/myamazingcv

Conflicts:
	grails-app/views/cv.gsp
	web-app/css/macv.css