added prototype
eclipse stuff
merged
Revert "merged"

This reverts commit 3f6e839440b19a04eeeca4e6ede7414a7d928648.
Merge branch 'master' of http://goodav@github.com/goodav/test.git
added line