Start lab 3
Merge branch 'master' into activeWork
Hopefully fixed the lab issues
Start lab3
Joke.java compete
Finished last bit on Joke.java
Save point before deleting the bullshit form calpoly
Hell if I know
Save point for the night
Should have a joke layout being placed in zee code
Should have action bar figured out
Should be ready for upgrade
Merge branch 'activeWork' of github.com:Odelliesdeli/School into activeWork
Switched to Android studio 1.0
JokeView Layout
Start HW4 and grab a bunch of lab 3
just no
main.xml for hw4
Fixed main.xml
Should be done...