Added re-enter pw field
stuff
Added historyActivity
Finished HistoryActivity
Merged ArvindWork2