push
.
Merge remote-tracking branch 'Justin/master'
fixing failed merge
Conflicts:
	proposal.tex
merge fixed
Merge remote-tracking branch 'Justin/master'
conflicted merge conflict resolution craziness
Conflicts:
	proposal.tex
flipped arrows
Merge pull request #7 from jcchin/master

merge conflict
removing intermediate latex files
wupps
erge branch 'master' of https://github.com/JustinSGray/Seedling2015
working on schedule
Merge remote-tracking branch 'Justin/master'
Merge branch 'master' of https://github.com/gjkennedy/Seedling2015
completed milestones
Merge pull request #8 from jcchin/master

updated milestones
deliverable stuff
Changes to Introduction.
new gantt
Changes to Objectives section.
Further small changes to MDO section.