parent stuff
stuff
Merge branch 'master' into settings
kills auto layout
kills auto layout
kills auto layout
kills auto layout
adds linkview
adds log in and out viewsa
adds log in and out views
adds log in and out views
adds log in in settingsview when first time
merges