make swap more stable
style changes
Merge branch 'master' of github.com:vishalok12/vocabapp