couple changes. preparing to merge Ryan
merge Ryan all-day Weds work to my master. Ticketing for Admin
Merge branch 'master' into chris2
did a bunch of work on putting front page together weds night
1 am Weds night lots of work on home index page
worked on bubbles thurs morning - transparency
worked on front layout more Thurs morning
worked on front layout more Thurs morning final
Merge branch 'master' of github.com:rkuhel/lost_tribes3
pulled ryan and mike work 11 am Thurs
finally with Z help got ryan and mike work merged in Thurs afternoon and functioning with Tickets ryan made and I put in tons of skeleton start and stops in view files
events styling
Merge branch 'master' of https://github.com/rkuhel/lost_tribes3
merged in ryanMike work to chris master with many changes and dealt with about 6 merge conflicts in views and deleted app html erb - using haml now from chris
pulled and fixed one more view from ryn merge - users show haml
events attending
pre merge homepage conflicts
pre merge