started ideas
Merge branch 'master' of https://github.com/ChrisFugl/G-project

Conflicts:
	report/milestone/milestone.tex