first test commit
merging commit
added actionbar, changed minSDK to 11