no message
no message
no message
Merge branch 'content' into gh-pages

Conflicts:
	dist/scripts/hackathon-portal.js
	dist/scripts/hackathon-portal.min.js
no message
Merge branch 'gh-pages' of https://github.com/iKahvedzic/hackathon-portal into iKahvedzic-gh-pages

Conflicts:
	dist/data/specifications.json
	dist/scripts/hackathon-portal.js
	dist/scripts/hackathon-portal.min.js
	dist/styles/main.min.css
Merge branch 'iKahvedzic-gh-pages' into gh-pages
Merge branch 'gh-pages' of github.com:ericsson-innovate/hackathon-portal into gh-pages

Conflicts:
	dist/data/specifications.json
	dist/scripts/hackathon-portal.js
	dist/scripts/hackathon-portal.min.js
	dist/styles/main.min.css