merge buycard
merge buycard resolved
merge buycard again
merge buycard again
solving some more merge problems
saved selected course for other tabs and future use
Clean Up and start workon the MyFlashCard