eclipse proj setup
Starting to add samples
Merge conflict fixes