add event custom post type - tested and working
added archive for events
got events working
blog shortcode output bigger image
change events and remove meta boxes
resolve functions.php merge from boilerplate conflicts
Merge branch 'master' into events
update wpml
Merge branch 'plugins' into theme-metrolium
Move limit login attempts and force strong passwords to mu folder
Merge branch 'plugins' into theme-metrolium
add mu plugins for login and password security
Merge branch 'plugins' into theme-metrolium
Merge remote-tracking branch 'boilerplate/theme-metrolium' into events
edited mu plugins
Merge branch 'plugins' into theme-metrolium
add login attempts file
Merge branch 'plugins' into theme-metrolium
Merge remote-tracking branch 'boilerplate/theme-metrolium' into events
wrking on events thingy