Initial commit. 
Deleted and added the project to make it compatible with eclipse.
Merge remote-tracking branch 'origin/master'