JAAAZDAAAA!!!111cos(0)
openshift config
added parent pom
Merge branch 'master' of https://github.com/piotrpachalko/hackaton-2014
git ignore ;) brutal way
Added parent pom
Prepared structure for the project.
Deleted mesh.
Merge branch 'master' of https://github.com/piotrpachalko/hackaton-2014
first REST implementation with mock data
Merge branch 'master' of github.com:piotrpachalko/hackaton-2014
Merge from wujek-predyktor
Merge branch 'master' of github.com:piotrpachalko/hackaton-2014
rest fetcher first draft
Merge branch 'master' into michal

Conflicts:
	backend/freya-web/pom.xml
Update README.md
Add: recommender builder
my files moved to my dir ;)
Merge branch 'master' into michal
Merge from wujek