Abstract class
merged with local abstraction changes
added classpath and project files to ignore
Merge branch 'master' of github.com:danieltcv/PSD3-Sprint1
Updated gitignore and deleted felix cache from repo
Merge branch 'master' of github.com:danieltcv/PSD3-Sprint1
Fix #22